Skip to content

Merge appbuilder branch for 1.7.1 in release#1750

Merged
rosen-vladimirov merged 11 commits into
releasefrom
vladimirov/merge-appbuilder-1.7.1
May 11, 2016
Merged

Merge appbuilder branch for 1.7.1 in release#1750
rosen-vladimirov merged 11 commits into
releasefrom
vladimirov/merge-appbuilder-1.7.1

Conversation

@rosen-vladimirov

Copy link
Copy Markdown
Contributor

Merge some fixes required for AppBuilder integration.

rosen-vladimirov and others added 11 commits March 31, 2016 13:53
When --baseConfig is passed, we should use it when merging Info.plist files.
Disable analytics in AppBuilder
When `--no-hooks` is passed on command line, the hooks will not be executed.
When the tns-<platform> key in the package.json of nativescript project has custom template the template key must be kept and the version key should be added.
…tform-templates-when-using-init

Include custom platform template when using tns init -f
When the `tns-<platform>` key in the package.json of nativescript project has custom template the template key must be kept and the version key should be added. When the --framework-name and --framework-version are passed as arguments.
…tform-templates-when-using-init-with-custom-parameters

Include custom platform template when using tns init
Remove disableAnalytics set to true - we've used it only in AppBuilder branch.
@Mitko-Kerezov

Copy link
Copy Markdown
Contributor

👍

@rosen-vladimirov
rosen-vladimirov merged commit 00fa471 into release May 11, 2016
@rosen-vladimirov
rosen-vladimirov deleted the vladimirov/merge-appbuilder-1.7.1 branch May 11, 2016 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants